dgit.raspbian.org Git - xen.git/commit

projects / xen.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e79bd5b 12af2ea)

author	mafetter@fleming.research <mafetter@fleming.research>
	Mon, 4 Apr 2005 16:13:17 +0000 (16:13 +0000)
committer	mafetter@fleming.research <mafetter@fleming.research>
	Mon, 4 Apr 2005 16:13:17 +0000 (16:13 +0000)
commit	52367cb022232d5d90a84309a4c644a8d55b9e12
tree	c7ad801f0615ecd882f2e4cd684a96e92c776602	tree \| snapshot
parent	e79bd5b63bc89a3fdb2c7529931d784cf8c436f5	commit \| diff
parent	12af2ea309ea8f116483672d9900b863e75f0c7e	commit \| diff

bitkeeper revision 1.1267 (4251679dHqcry__n_OW9aNhfUtjZ_A)

Hand merged

Signed-off-by: michael.fetterman@cl.cam.ac.uk

19 files changed:

.rootkeys	diff1 \|	diff2 \|	blob \| history
BitKeeper/etc/ignore	diff1 \|	diff2 \|	blob \| history
tools/libxc/xc.h	diff1 \|	diff2 \|	blob \| history
tools/libxc/xc_plan9_build.c	diff1 \|	diff2 \|	blob \| history
tools/misc/Makefile	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/domain.c	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/domain_build.c	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/mm.c	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/shadow.c	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/traps.c	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/vmx.c	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/vmx_io.c	diff1 \|	diff2 \|	blob \| history
xen/common/grant_table.c	diff1 \|	diff2 \|	blob \| history
xen/common/page_alloc.c	diff1 \|	diff2 \|	blob \| history
xen/common/schedule.c	diff1 \|	diff2 \|	blob \| history
xen/drivers/char/console.c	diff1 \|	diff2 \|	blob \| history
xen/include/asm-x86/mm.h	diff1 \|	diff2 \|	blob \| history
xen/include/asm-x86/page.h	diff1 \|	diff2 \|	blob \| history
xen/include/xen/sched.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.